diff --git a/Image.gz-dtb-4.14 b/hikey/4.14/Image.gz-dtb
similarity index 100%
rename from Image.gz-dtb-4.14
rename to hikey/4.14/Image.gz-dtb
Binary files differ
diff --git a/hi6220-hikey.dtb-4.14 b/hikey/4.14/hi6220-hikey.dtb
similarity index 100%
rename from hi6220-hikey.dtb-4.14
rename to hikey/4.14/hi6220-hikey.dtb
Binary files differ
diff --git a/Image.gz-dtb-4.19 b/hikey/4.19/Image.gz-dtb
similarity index 100%
rename from Image.gz-dtb-4.19
rename to hikey/4.19/Image.gz-dtb
Binary files differ
diff --git a/hi6220-hikey.dtb-4.19 b/hikey/4.19/hi6220-hikey.dtb
similarity index 100%
rename from hi6220-hikey.dtb-4.19
rename to hikey/4.19/hi6220-hikey.dtb
Binary files differ
diff --git a/Image.gz-dtb-hikey960-4.14 b/hikey960/4.14/Image.gz-dtb
similarity index 100%
rename from Image.gz-dtb-hikey960-4.14
rename to hikey960/4.14/Image.gz-dtb
Binary files differ
diff --git a/hi3660-hikey960.dtb-4.14 b/hikey960/4.14/hi3660-hikey960.dtb
similarity index 100%
rename from hi3660-hikey960.dtb-4.14
rename to hikey960/4.14/hi3660-hikey960.dtb
Binary files differ
diff --git a/Image.gz-dtb-hikey960-4.19 b/hikey960/4.19/Image.gz-dtb
similarity index 100%
rename from Image.gz-dtb-hikey960-4.19
rename to hikey960/4.19/Image.gz-dtb
Binary files differ
diff --git a/hi3660-hikey960.dtb-4.19 b/hikey960/4.19/hi3660-hikey960.dtb
similarity index 100%
rename from hi3660-hikey960.dtb-4.19
rename to hikey960/4.19/hi3660-hikey960.dtb
Binary files differ
diff --git a/update-prebuilts.sh b/update-prebuilts.sh
index a68a6a4..4648d61 100755
--- a/update-prebuilts.sh
+++ b/update-prebuilts.sh
@@ -12,9 +12,10 @@
     local build_num="${1}" && shift
     local kernel_version="${1}" && shift
     local board="hikey960"
-    wget_wrapper ${build_num} ${board} Image.gz-dtb Image.gz-dtb-hikey960-${kernel_version}
-    wget_wrapper ${build_num} ${board} hi3660-hikey960.dtb hi3660-hikey960.dtb-${kernel_version}
-    wget_wrapper ${build_num} ${board} manifest_${build_num}.xml manifest_${build_num}-${board}.xml
+    mkdir -p ${board}/${kernel_version}
+    wget_wrapper ${build_num} ${board} Image.gz-dtb ${board}/${kernel_version}/Image.gz-dtb
+    wget_wrapper ${build_num} ${board} hi3660-hikey960.dtb ${board}/${kernel_version}/hi3660-hikey960.dtb
+    wget_wrapper ${build_num} ${board} manifest_${build_num}.xml ${board}/${kernel_version}/manifest_${build_num}-${board}.xml
 }
 
 
@@ -22,9 +23,10 @@
     local build_num="${1}" && shift
     local kernel_version="${1}" && shift
     local board="hikey"
-    wget_wrapper ${build_num} ${board} Image.gz-dtb Image.gz-dtb-${kernel_version}
-    wget_wrapper ${build_num} ${board} hi6220-hikey.dtb hi6220-hikey.dtb-${kernel_version}
-    wget_wrapper ${build_num} ${board} manifest_${build_num}.xml manifest_${build_num}-${board}.xml
+    mkdir -p ${board}/${kernel_version}
+    wget_wrapper ${build_num} ${board} Image.gz-dtb ${board}/${kernel_version}/Image.gz-dtb
+    wget_wrapper ${build_num} ${board} hi6220-hikey.dtb ${board}/${kernel_version}/hi6220-hikey.dtb
+    wget_wrapper ${build_num} ${board} manifest_${build_num}.xml ${board}/${kernel_version}/manifest_${build_num}-${board}.xml
 }
 
 function update_kernel_dtb(){